Include package version along with kernel release in stack traces

Forwarded: not-needed

For distribution binary packages we assume
$DISTRIBUTION_OFFICIAL_BUILD, $DISTRIBUTOR and $DISTRIBUTION_VERSION
are set.

Gbp-Pq: Topic debian
Gbp-Pq: Name version.patch

diff --git a/Makefile b/Makefile
index 67f26d8b29343a395e764e345c070d9cc00b85c4..a252e7e815773ec59e461adc86ccca0a2ea6f230 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1307,7 +1307,7 @@ PHONY += prepare archprepare
 archprepare: outputmakefile archheaders archscripts scripts include/config/kernel.release \
        asm-generic $(version_h) include/generated/utsrelease.h \
        include/generated/compile.h include/generated/autoconf.h \
-       include/generated/rustc_cfg remove-stale-files
+       include/generated/rustc_cfg include/generated/package.h remove-stale-files
 
 prepare0: archprepare
        $(Q)$(MAKE) $(build)=scripts/mod
@@ -1365,6 +1365,16 @@ define filechk_version.h
        echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)
 endef
 
+ifneq ($(DISTRIBUTION_OFFICIAL_BUILD),)
+define filechk_package.h
+       echo \#define LINUX_PACKAGE_ID \" $(DISTRIBUTOR) $(DISTRIBUTION_VERSION)\"
+endef
+else
+define filechk_package.h
+       echo \#define LINUX_PACKAGE_ID \"\"
+endef
+endif
+
 $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0)
 $(version_h): private SUBLEVEL := $(or $(SUBLEVEL), 0)
 $(version_h): FORCE
@@ -1379,6 +1389,9 @@ filechk_compile.h = $(srctree)/scripts/mkcompile_h \
 include/generated/compile.h: FORCE
        $(call filechk,compile.h)
 
+include/generated/package.h: $(srctree)/Makefile FORCE
+       $(call filechk,package.h)
+
 PHONY += headerdep
 headerdep:
        $(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a45fe147868bc43d4de53c8b5f5c298b46a959c6..a7a54e9f85cdeb080cd4039ef53c0f306c1ce32e 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -38,6 +38,7 @@
 #include <linux/uaccess.h>
 #include <linux/pkeys.h>
 #include <linux/seq_buf.h>
+#include <generated/package.h>
 
 #include <asm/interrupt.h>
 #include <asm/io.h>
@@ -1560,8 +1561,9 @@ static void __show_regs(struct pt_regs *regs)
 
        printk("NIP:  "REG" LR: "REG" CTR: "REG"\n",
               regs->nip, regs->link, regs->ctr);
-       printk("REGS: %px TRAP: %04lx   %s  (%s)\n",
-              regs, regs->trap, print_tainted(), init_utsname()->release);
+       printk("REGS: %px TRAP: %04lx   %s  (%s%s)\n",
+              regs, regs->trap, print_tainted(), init_utsname()->release,
+              LINUX_PACKAGE_ID);
        printk("MSR:  "REG" ", regs->msr);
        print_msr_bits(regs->msr);
        pr_cont("  CR: %08lx  XER: %08lx\n", regs->ccr, regs->xer);

diff --git a/arch/x86/um/sysrq_64.c b/arch/x86/um/sysrq_64.c
index 340d8a243c8a8a319f1d1dc3a82f396e3af882b8..0e01cedb302429f3fb4a6ca6648027dc41ab57d7 100644 (file)
--- a/arch/x86/um/sysrq_64.c
+++ b/arch/x86/um/sysrq_64.c
@@ -10,6 +10,7 @@
 #include <linux/sched.h>
 #include <linux/sched/debug.h>
 #include <linux/utsname.h>
+#include <generated/package.h>
 #include <asm/current.h>
 #include <asm/ptrace.h>
 
@@ -17,8 +18,9 @@ void show_regs(struct pt_regs *regs)
 {
        printk("\n");
        print_modules();
-       printk(KERN_INFO "Pid: %d, comm: %.20s %s %s\n", task_pid_nr(current),
-               current->comm, print_tainted(), init_utsname()->release);
+       printk(KERN_INFO "Pid: %d, comm: %.20s %s %s%s\n", task_pid_nr(current),
+               current->comm, print_tainted(), init_utsname()->release,
+               LINUX_PACKAGE_ID);
        printk(KERN_INFO "RIP: %04lx:%pS\n", PT_REGS_CS(regs) & 0xffff,
               (void *)PT_REGS_IP(regs));
        printk(KERN_INFO "RSP: %016lx  EFLAGS: %08lx\n", PT_REGS_SP(regs),

diff --git a/kernel/hung_task.c b/kernel/hung_task.c
index d2254c91450b2edc45365d3005d2b2809c3fb571..4003887c467aaf6766859be09b5a05eee76bcaaa 100644 (file)
--- a/kernel/hung_task.c
+++ b/kernel/hung_task.c
@@ -26,6 +26,7 @@
 #include <linux/rwsem.h>
 #include <linux/sys_info.h>
 
+#include <generated/package.h>
 #include <trace/events/sched.h>
 
 /*
@@ -254,10 +255,11 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout,
                        sysctl_hung_task_warnings--;
                pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
                       t->comm, t->pid, (jiffies - t->last_switch_time) / HZ);
-               pr_err("      %s %s %.*s\n",
+               pr_err("      %s %s %.*s%s\n",
                        print_tainted(), init_utsname()->release,
                        (int)strcspn(init_utsname()->version, " "),
-                       init_utsname()->version);
+                       init_utsname()->version,
+                       LINUX_PACKAGE_ID);
                if (t->flags & PF_POSTCOREDUMP)
                        pr_err("      Blocked by coredump.\n");
                pr_err("\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\""

diff --git a/lib/dump_stack.c b/lib/dump_stack.c
index f0c78b5b5324747599f31ed02c43cf7991d1342d..e4f6127e315d002457702b8683d7ac4706be530d 100644 (file)
--- a/lib/dump_stack.c
+++ b/lib/dump_stack.c
@@ -14,6 +14,7 @@
 #include <linux/kexec.h>
 #include <linux/utsname.h>
 #include <linux/stop_machine.h>
+#include <generated/package.h>
 
 static char dump_stack_arch_desc_str[128];
 
@@ -54,7 +55,7 @@ void __init dump_stack_set_arch_desc(const char *fmt, ...)
  */
 void dump_stack_print_info(const char *log_lvl)
 {
-       printk("%sCPU: %d UID: %u PID: %d Comm: %.20s %s%s %s %.*s %s " BUILD_ID_FMT "\n",
+       printk("%sCPU: %d UID: %u PID: %d Comm: %.20s %s%s %s %.*s %s %s " BUILD_ID_FMT "\n",
               log_lvl, raw_smp_processor_id(),
               __kuid_val(current_real_cred()->euid),
               current->pid, current->comm,
@@ -62,7 +63,9 @@ void dump_stack_print_info(const char *log_lvl)
               print_tainted(),
               init_utsname()->release,
               (int)strcspn(init_utsname()->version, " "),
-              init_utsname()->version, preempt_model_str(), BUILD_ID_VAL);
+              init_utsname()->version, preempt_model_str(),
+              LINUX_PACKAGE_ID,
+              BUILD_ID_VAL);
 
        if (get_taint())
                printk("%s%s\n", log_lvl, print_tainted_verbose());